From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 7 Jan 2011 19:29:06 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5267^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=96982c00c11bf6c8007c5ac354c7bdc1ebd6f4b7;p=emacs.git

Merge from mainline.
---

96982c00c11bf6c8007c5ac354c7bdc1ebd6f4b7